From d7317010d3d79fed93828a927ab667338159c60b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Tue, 16 Aug 2005 16:25:46 +0000 Subject: [PATCH] reordering of allocated memory --- ChangeLog | 6 ++++++ babl/babl-format.c | 4 ++-- babl/babl-model.c | 4 ++-- babl/babl-pixel-format.c | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2cb9b9..8702eae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-08-16 Øyvind Kolås + + * babl/babl-model.c: (model_new) + * babl/babl-pixel-format.c: (pixel_format_new): reordered allocation + to place string (to avoid placing pointers in non aligned adresses). + 2005-08-16 Øyvind Kolås * babl/babl-component.c: (component_new, each_babl_component_destroy) allocate diff --git a/babl/babl-format.c b/babl/babl-format.c index f058e54..a64349a 100644 --- a/babl/babl-format.c +++ b/babl/babl-format.c @@ -62,11 +62,11 @@ pixel_format_new (const char *name, sizeof (int) * (bands+1) + sizeof (int) * (bands+1),1); - babl->instance.name = ((void *)babl) + sizeof (BablPixelFormat); - babl->pixel_format.model = ((void *)babl->instance.name) + strlen (name) + 1; + babl->pixel_format.model = ((void *)babl) + sizeof (BablPixelFormat); babl->pixel_format.component = ((void *)babl->pixel_format.model) + sizeof (BablModel*) * (bands+1); babl->pixel_format.type = ((void *)babl->pixel_format.component) + sizeof (BablComponent*) * (bands+1); babl->pixel_format.sampling = ((void *)babl->pixel_format.type) + sizeof (BablType*) * (bands+1); + babl->instance.name = ((void *)babl->pixel_format.sampling) + sizeof (BablSampling*) * (bands+1); babl->class_type = BABL_PIXEL_FORMAT; babl->instance.id = id; diff --git a/babl/babl-model.c b/babl/babl-model.c index bfbd11d..6b44cd7 100644 --- a/babl/babl-model.c +++ b/babl/babl-model.c @@ -48,8 +48,8 @@ model_new (const char *name, babl = babl_calloc (sizeof (BablModel) + sizeof (BablComponent*) * (components+1) + strlen (name) + 1, 1); - babl->instance.name = ((void*)babl) + sizeof (BablModel); - babl->model.component = ((void*)babl->instance.name) + strlen (name) + 1; + babl->model.component = ((void*)babl) + sizeof (BablModel); + babl->instance.name = ((void*)babl->model.component) + sizeof (BablComponent*) * (components + 1); babl->class_type = BABL_MODEL; babl->instance.id = id; diff --git a/babl/babl-pixel-format.c b/babl/babl-pixel-format.c index f058e54..a64349a 100644 --- a/babl/babl-pixel-format.c +++ b/babl/babl-pixel-format.c @@ -62,11 +62,11 @@ pixel_format_new (const char *name, sizeof (int) * (bands+1) + sizeof (int) * (bands+1),1); - babl->instance.name = ((void *)babl) + sizeof (BablPixelFormat); - babl->pixel_format.model = ((void *)babl->instance.name) + strlen (name) + 1; + babl->pixel_format.model = ((void *)babl) + sizeof (BablPixelFormat); babl->pixel_format.component = ((void *)babl->pixel_format.model) + sizeof (BablModel*) * (bands+1); babl->pixel_format.type = ((void *)babl->pixel_format.component) + sizeof (BablComponent*) * (bands+1); babl->pixel_format.sampling = ((void *)babl->pixel_format.type) + sizeof (BablType*) * (bands+1); + babl->instance.name = ((void *)babl->pixel_format.sampling) + sizeof (BablSampling*) * (bands+1); babl->class_type = BABL_PIXEL_FORMAT; babl->instance.id = id; -- 2.30.2